From: Aaron M. Ucko <amu@ucko.debian.net>
Date: Thu, 2 Dec 2021 04:33:11 +0000 (-0500)
Subject: Omit convenience mbed TLS copy
X-Git-Tag: archive/raspbian/2.17.0+ds-6+rpi1^2^2~21
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=2651dc9a0f08faaab9675bef0a21523b2275a34d;p=ncbi-blast%2B.git

Omit convenience mbed TLS copy


Gbp-Pq: Name system_mbedtls_only
---

diff --git a/c++/src/connect/Makefile.connssl.lib b/c++/src/connect/Makefile.connssl.lib
index 5f03e37f..1186a188 100644
--- a/c++/src/connect/Makefile.connssl.lib
+++ b/c++/src/connect/Makefile.connssl.lib
@@ -1,6 +1,6 @@
 # $Id: Makefile.connssl.lib 682178 2024-04-23 19:31:32Z ucko $
 
-CPPFLAGS = $(TLS_INCLUDE) -I$(srcdir)/mbedtls $(ORIG_CPPFLAGS)
+CPPFLAGS = $(TLS_INCLUDE) $(ORIG_CPPFLAGS)
 
 SRC_MBED = aes aesce aesni aria asn1parse asn1write base64 bignum bignum_core \
            bignum_mod bignum_mod_raw block_cipher camellia ccm chacha20 \
@@ -21,7 +21,7 @@ SRC_MBED = aes aesce aesni aria asn1parse asn1write base64 bignum bignum_core \
            ssl_tls13_client ssl_tls13_generic ssl_tls13_keys ssl_tls13_server \
            threading timing version_features x509 x509_create x509_crl \
            x509_crt x509_csr x509write x509write_crt x509write_csr
-SRC_TLS  = ncbi_gnutls ncbi_mbedtls ncbi_tls $(SRC_MBED:%=mbedtls/%)
+SRC_TLS  = ncbi_gnutls ncbi_mbedtls ncbi_tls # $(SRC_MBED:%=mbedtls/%)
 
 SRC      = $(SRC_TLS)
 LIB      = connssl
diff --git a/c++/src/connect/Makefile.xxconnect2.lib b/c++/src/connect/Makefile.xxconnect2.lib
index e72e3b86..a9eea404 100644
--- a/c++/src/connect/Makefile.xxconnect2.lib
+++ b/c++/src/connect/Makefile.xxconnect2.lib
@@ -9,8 +9,7 @@ REQUIRES = LIBUV NGHTTP2
 LIB_OR_DLL = both
 DLL_LIB = xconnect
 
-CPPFLAGS = $(LIBUV_INCLUDE) $(NGHTTP2_INCLUDE) $(TLS_INCLUDE) \
-           -I$(srcdir)/mbedtls $(ORIG_CPPFLAGS)
+CPPFLAGS = $(LIBUV_INCLUDE) $(NGHTTP2_INCLUDE) $(TLS_INCLUDE) $(ORIG_CPPFLAGS)
 
 LIBS = $(XXCONNECT2_LIBS) $(ORIG_LIBS)